From 11ae3daf79de84f2dbe912ffaeb0d71464d3b176 Mon Sep 17 00:00:00 2001 From: "vh249@arcadians.cl.cam.ac.uk" Date: Tue, 5 Apr 2005 09:07:08 +0000 Subject: [PATCH] bitkeeper revision 1.1236.57.1 (4252553cg_fYLV1TD86ca_IbSyJ_8w) unnecessary difference between vanilla and xen Signed-off-by: Vincent Hanquez --- linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c | 2 +- linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c | 2 +- linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c index 99cba038fc..771208d00c 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c @@ -167,7 +167,7 @@ void show_regs(struct pt_regs * regs) if (regs->xcs & 2) printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp); printk(" EFLAGS: %08lx %s (%s)\n", - regs->eflags, print_tainted(),UTS_RELEASE); + regs->eflags, print_tainted(), system_utsname.release); printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", regs->eax,regs->ebx,regs->ecx,regs->edx); printk("ESI: %08lx EDI: %08lx EBP: %08lx", diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c index e22c3e1932..5a474646d6 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c @@ -194,7 +194,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) } } pmd_idx = 0; - } + } } static inline int page_kills_ppro(unsigned long pagenr) diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h index e278d7098e..42fde5da54 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h @@ -9,13 +9,12 @@ #include /* for phys_to_virt and page_to_pseudophys */ #define pmd_populate_kernel(mm, pmd, pte) \ - set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte))) + set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte))) -#define pmd_populate(mm, pmd, pte) do { \ +#define pmd_populate(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE + \ ((unsigned long long)page_to_pfn(pte) << \ - (unsigned long long) PAGE_SHIFT))); \ -} while (0) + (unsigned long long) PAGE_SHIFT))) /* * Allocate and free page tables. */ -- 2.30.2